Misc language cleanups.

diff --git a/gpsbabel/magellan.h b/gpsbabel/magellan.h
index b1d384b7260b275f0d9361f0b217f6e2ad294e65..8f4d2c14cc278f83f7a57e8fc90998a6b4dffd2a 100644 (file)
--- a/gpsbabel/magellan.h
+++ b/gpsbabel/magellan.h
@@ -24,7 +24,7 @@
  * (Donations welcome. :-)
  */
 typedef enum {
-       mm_unknown,
+       mm_unknown = 0 ,
        mm_gps315320,
        mm_map410,
        mm_map330,

diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index a46c62dc73efc0631e61bfb4adca4c69f766783e..112faff56ad35084210f63a49a9affb5e2410275 100644 (file)
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -121,7 +121,7 @@ pid_to_model_t pid_to_model[] =
        { mm_map330, 30, "Map 330" },
        { mm_gps310, 31, "GPS 310" },
        { mm_meridian, 33, "Meridian" },
-       { 0, 0, NULL }
+       { mm_unknown, 0, NULL }
 };
 
 
@@ -206,7 +206,7 @@ mag_verparse(char *ibuf)
        got_version = 1;
        sscanf(ibuf,"$PMGNVER,%d,%[^,]", &prodid, version);
 
-       for (pp = pid_to_model; pp->model ; pp++) {
+       for (pp = pid_to_model; pp->model != mm_unknown; pp++) {
                if (pp->pid == prodid) {
                        break;
                }
@@ -335,7 +335,7 @@ mag_deinit(void)
        tcsetattr(magfd, TCSANOW, &orig_tio);
        fclose(magfile);
 }
-
+#if 0
 /*
  * Given an incoming track messages of the form:
  * $PMGNTRK,3605.259,N,08644.389,W,00151,M,201444.61,A,,020302*66
@@ -360,14 +360,11 @@ mag_trkparse(char *trkmsg)
 
        printf("%s\n", trkmsg);
        memset(&tm, 0, sizeof(tm));
-#if 0
+
        sscanf(trkmsg,"$PMGNTRK,%lf,%c,%lf,%c,%d,%c,%d.%d,A,,%d", 
                &latdeg,&latdir,
                &lngdeg,&lngsecs,&lngdir,
                &alt,&altunits,&hms,&fracsecs,&dmy);
-#else
-latdeg = 123;
-#endif
 
        tm.tm_sec = hms % 100;
        hms = hms / 100;
@@ -394,6 +391,7 @@ latdeg = 123;
        return waypt;
        
 }
+#endif
 
 const char *
 mag_find_descr_from_token(const char *token)

diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index 17ec9817c50b00eed2712be60beb20550e0aaa0a..ac4980553681f1ebf01abc00b3e321c2a4571190 100644 (file)
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -69,15 +69,16 @@ my_fread8(void *ptr, FILE *stream)
 {
        char cbuf[8];
        char *cptr = ptr;
+       size_t rv;
 
        if (!endianness_tested) {
                test_endianness();
        }
 
        if (i_am_little_endian) {       
-               fread(ptr, 8, 1, stream);
+               rv = fread(ptr, 8, 1, stream);
        } else { 
-               fread(cbuf, 8, 1, stream);
+               rv = fread(cbuf, 8, 1, stream);
                cptr[0] = cbuf[7];
                cptr[1] = cbuf[6];
                cptr[2] = cbuf[5];
@@ -87,6 +88,7 @@ my_fread8(void *ptr, FILE *stream)
                cptr[6] = cbuf[1];
                cptr[7] = cbuf[0];
        }
+       return rv;
 }
 
 static 
@@ -101,7 +103,7 @@ my_fwrite8(void *ptr, FILE *stream)
        }
 
        if (i_am_little_endian) {       
-               fwrite(ptr, 8, 1, stream);
+               return fwrite(ptr, 8, 1, stream);
        } else {
                cbuf[0] = cptr[7];
                cbuf[1] = cptr[6];
@@ -111,7 +113,7 @@ my_fwrite8(void *ptr, FILE *stream)
                cbuf[5] = cptr[2];
                cbuf[6] = cptr[1];
                cbuf[7] = cptr[0];
-               fwrite(cbuf, 8, 1, stream);
+               return fwrite(cbuf, 8, 1, stream);
        }
 }
 
@@ -121,20 +123,22 @@ my_fread4(void *ptr, FILE *stream)
 {
        char cbuf[4];
        char *cptr = ptr;
+       size_t rv;
        
        if (!endianness_tested) {
                test_endianness();
        }
 
        if (i_am_little_endian) {       
-               fread(ptr, 4, 1, stream);
+               rv = fread(ptr, 4, 1, stream);
        } else {
-               fread(cbuf, 4, 1, stream);
+               rv = fread(cbuf, 4, 1, stream);
                cptr[0] = cbuf[3];
                cptr[1] = cbuf[2];
                cptr[2] = cbuf[1];
                cptr[3] = cbuf[0];
        }
+       return rv;
 }
 
 static 
@@ -149,13 +153,13 @@ my_fwrite4(void *ptr, FILE *stream)
        }
 
        if (i_am_little_endian) {       
-               fwrite(ptr, 4, 1, stream);
+               return fwrite(ptr, 4, 1, stream);
        } else {
                cbuf[0] = cptr[3];
                cbuf[1] = cptr[2];
                cbuf[2] = cptr[1];
                cbuf[3] = cptr[0];
-               fwrite(cbuf, 4, 1, stream);
+               return fwrite(cbuf, 4, 1, stream);
        }
 }
 
@@ -206,12 +210,12 @@ mapsend_read(void)
                wpt_tmp = calloc(sizeof(*wpt_tmp), 1);
 
                fread(&scount, sizeof(scount), 1, mapsend_file_in);
-               fread(&tbuf, scount, 1, mapsend_file_in);
+               fread(tbuf, scount, 1, mapsend_file_in);
                p = strncpy(name, tbuf, scount);
                p[scount] = '\0';
 
                fread(&scount, sizeof(scount), 1, mapsend_file_in);
-               fread(&tbuf, scount, 1, mapsend_file_in);
+               fread(tbuf, scount, 1, mapsend_file_in);
                p = strncpy(comment, tbuf, scount);
                p[scount] = '\0';